menushell: Don’t dereference before typechecking

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 20a36a28913cf07f4e0ed7cdaf81fa1f76822720..b8b3e6bd2d7b2404cfd4acfa5a2dd88803357ddc 100644 (file)
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -1196,12 +1196,13 @@ void
 gtk_menu_shell_select_item (GtkMenuShell *menu_shell,
                             GtkWidget    *menu_item)
 {
-  GtkMenuShellPrivate *priv = menu_shell->priv;
+  GtkMenuShellPrivate *priv;
   GtkMenuShellClass *class;
 
   g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
   g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
 
+  priv = menu_shell->priv;
   class = GTK_MENU_SHELL_GET_CLASS (menu_shell);
 
   if (class->select_item &&
@@ -1263,10 +1264,12 @@ gtk_menu_shell_real_select_item (GtkMenuShell *menu_shell,
 void
 gtk_menu_shell_deselect (GtkMenuShell *menu_shell)
 {
-  GtkMenuShellPrivate *priv = menu_shell->priv;
+  GtkMenuShellPrivate *priv;
 
   g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
 
+  priv = menu_shell->priv;
+
   if (priv->active_menu_item)
     {
       gtk_menu_item_deselect (GTK_MENU_ITEM (priv->active_menu_item));
@@ -1793,11 +1796,13 @@ void
 _gtk_menu_shell_set_grab_device (GtkMenuShell *menu_shell,
                                  GdkDevice    *device)
 {
-  GtkMenuShellPrivate *priv = menu_shell->priv;
+  GtkMenuShellPrivate *priv;
 
   g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
   g_return_if_fail (device == NULL || GDK_IS_DEVICE (device));
 
+  priv = menu_shell->priv;
+
   if (!device)
     priv->grab_pointer = NULL;
   else if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
@@ -1869,10 +1874,12 @@ void
 gtk_menu_shell_set_take_focus (GtkMenuShell *menu_shell,
                                gboolean      take_focus)
 {
-  GtkMenuShellPrivate *priv = menu_shell->priv;
+  GtkMenuShellPrivate *priv;
 
   g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
 
+  priv = menu_shell->priv;
+
   if (priv->take_focus != take_focus)
     {
       priv->take_focus = take_focus;